[automerger skipped] Mark ab/7061308 as merged in stage. am: 20fa3c3bf8 -s ours am: 8650581fb4 -s ours

am skip reason: Change-Id I9d06499ed8f487ad34f74405305b258c2c60a71b with SHA-1 ea3d454a66 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief4eff794426ae34555d264c3cd9f21eba4f055d