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

am skip reason: Change-Id I143414d9e0010360f410d4ce416dea47a18081e6 with SHA-1 468689f430 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I715385eae8453ef80bca3b244ef41ca18c501d04