[automerger skipped] Mark ab/7061308 as merged in stage. am: 39743039e2 -s ours am: bb50d20ec9 -s ours

am skip reason: Change-Id I9f18d531cd62e1137ca164e076fc040daec323ca with SHA-1 cd2ce0a2e0 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae13a5ac84190ae57ba89592f9d4922eb5e8017b