[automerger skipped] Mark ab/7061308 as merged in stage. am: 23764b95d6 -s ours am: b68cfec20a -s ours

am skip reason: Change-Id I874fdeb7cee346b0beb9c897a57f4076a8ae4a99 with SHA-1 00f96b3f5a is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27ef01734a4cba57b8d04642984a96fdce299585