[automerger skipped] Mark ab/7061308 as merged in stage. am: 22a7f273e9 -s ours am: e69565085d -s ours

am skip reason: Change-Id I3a00acb3cecd49b3618c4e55667f1c37eb9ab400 with SHA-1 5ec0614b16 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8461c43a30ef770e2236c41d00ffa7330fa15f7