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

am skip reason: Change-Id I32832cea5e49610337fd77e36c7a914ae3bf108c with SHA-1 d5263a3b91 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53ddfb8d5a7d6a6b513a5c6428b30b260d095c9b