[automerger skipped] Mark ab/7061308 as merged in stage. am: eaf3e42071 -s ours am: fd2d11e0a8 -s ours am: b71945c2f5 -s ours

am skip reason: Change-Id I3b25f8241114cec53feb8baf1740bb4dfdf93ffc with SHA-1 70e6f3b7df is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38be810e8d3354d5fd1201f9e7abccc2f5e0bdc7