[automerger skipped] Mark ab/7061308 as merged in stage. am: 978a5d03e1 -s ours am: 4c12b4720b -s ours

am skip reason: Change-Id Ie43615061948e35099344d3da2dd1b92bf0eac8c with SHA-1 eab237cb8d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc3bd9f32d1ba1b504032a389f43eb0e071413c5