[automerger skipped] Mark ab/7061308 as merged in stage. am: 3507c7a450 -s ours am: 656506fe56 -s ours am: d0019c0c4f -s ours

am skip reason: Change-Id I001cc474c28475b886305627ebb536e0a51d0d23 with SHA-1 45cde3d2f6 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34fa8bfc993f627d7113db54f078e4e515a07e24