[automerger skipped] Mark ab/7061308 as merged in stage. am: b1192f78b3 -s ours am: 01611ca009 -s ours

am skip reason: Change-Id I2f40bf8394e18cf571fc3a1a89a28f87da38d16e with SHA-1 1badd0382e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7dc139c27570994a1d00cdb5f1b5049fc34a65e5