[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c04800463 -s ours am: 7aabc40fb2 -s ours

am skip reason: Change-Id I5f88da2249c3f2f90860eaab01ea2c0063d4d549 with SHA-1 b075927007 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafa1e8aba5c99e93cf3e63a97947cb919214e3e1