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