Mark ab/7061308 as merged in stage. Bug: 180401296 Merged-In: Id1fcb9b1808a1c769addd79dc1ba972d67407ec1 Change-Id: I2c67c488087210e848517b71f5643f4715d1d9cb