[automerger skipped] Mark ab/7061308 as merged in stage. am: 99b654c7b3 -s ours am: 82a0c49824 -s ours

am skip reason: Change-Id Iae4557ec8fdbfe5eea6a6e035374f2a86a2aa775 with SHA-1 00c16d5a34 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I281f6c3d1d8508778531a0d58608f6e30a219798