[automerger skipped] Mark ab/7061308 as merged in stage. am: 22a7f273e9 -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: I161e8b1b00eb4306c012b824614898e04542bf0b