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