[automerger skipped] Mark ab/7061308 as merged in stage. am: 08efe8840d -s ours am: 61b9427726 -s ours

am skip reason: Change-Id I2579b88a7562eeabb50c30c41e7e11a5618714a7 with SHA-1 1361c744d7 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I273b180bad6f4db2f4c5a8481080a9e40b196dbd