[automerger skipped] Mark ab/7061308 as merged in stage. am: 887292a9f9 -s ours am: 11e80c0d59 -s ours

am skip reason: Change-Id I95b824b198a36d92b8eb54500bdfbe4baefe4867 with SHA-1 af501c6ce8 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3183a191ca2458a724da151147d38b21b2ab4e14