[automerger skipped] Mark ab/7061308 as merged in stage. am: a1cc1bbcd4 -s ours am: ef5b104ce3 -s ours

am skip reason: Change-Id I496ec1904528984637e07199a2efee854709b0be with SHA-1 38bf8a5375 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia65a9cd664a6430b58b2dc671943677d4f9031c3