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