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