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

am skip reason: Change-Id I2f321cb7a3f813b791c6707eb6cc2f320694ae9d with SHA-1 b3c413d2e2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I909239ac310bc8e6e27f6e7182d27b84a2181b52