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