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