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

am skip reason: Change-Id Idfe5f25234cd6e6bd641d912524681304fa08752 with SHA-1 c9570b2a21 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I832cae4bed3abd0e65c2760b1becf3ecdfe75609