[automerger skipped] Mark ab/7061308 as merged in stage. am: 6eec2c269d -s ours

am skip reason: Change-Id I3efdf9a5c98f5d0bf3607c2ae7e2a7ec22d922a6 with SHA-1 8a1baea811 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63165de8bf4edc8b6c8b9b855d3cc3fe75cdbad4