[automerger skipped] Mark ab/7061308 as merged in stage. am: a37671cac0 -s ours am: 6341c80521 -s ours

am skip reason: Change-Id I639aa2533a3019e78b6afab848463120d2c72566 with SHA-1 a52760bf8a is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1d79107ecd0e7127fb458e51e5479a3ee6c51fe