[automerger skipped] Mark ab/7061308 as merged in stage. am: 8d49a45bea -s ours am: 22bf379376 -s ours

am skip reason: Change-Id I1aefe255fb2aa84f8973d4f80a9fbf47277a25a9 with SHA-1 58be9f8510 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf95b25060cc92fe83cea076155a8bf988704110