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