[automerger skipped] Mark ab/7061308 as merged in stage. am: 15bb0de272 -s ours am: dc5ab0ebd4 -s ours

am skip reason: Change-Id I7f4fc2cf65b82d5050c569f13bf775ff618f4358 with SHA-1 29a20e5998 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I430748c6200867159f1be3678fbe3ee8491ac0e1