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