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