[automerger skipped] Mark ab/7061308 as merged in stage. am: 2bde94d36c -s ours am: 84f89fb9ee -s ours

am skip reason: Change-Id I6f984c276bb3b129f1387df2bc3d331a5cd1f634 with SHA-1 a4b4f729f9 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58ac5feb71da95c3bce8486d7925f51a82c46b4b