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

am skip reason: Change-Id I5950e7445c94969a7714d289da6babcd5a82de11 with SHA-1 e1dca91068 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2660ed561cca4e045d8a177a28e70f028349b0b8