[automerger skipped] Mark ab/7061308 as merged in stage. am: 4bf3f984d9 -s ours am: 484a5603eb -s ours

am skip reason: Change-Id I13e31e8aad33dfe25883a38ab56d3ad4445ad782 with SHA-1 039fa9141c is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie75c694fdcd72b5f77281c90c019264906493367