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