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