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