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