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

am skip reason: Change-Id I8ca854ffd8b7235e295d52a32f950e383fb94da6 with SHA-1 168eb198a4 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec9bfad277d6aa55c7332a7702c4a85e2b8a6f74