[automerger skipped] Mark ab/7061308 as merged in stage. am: 9a8f19b42f -s ours am: a58c233bef -s ours

am skip reason: Change-Id Ia27fe379f85ce15f318600e942374bd545149a79 with SHA-1 eaa3b002c5 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia62868b72c9784d83f876cf4e28f9d31e38eb4b2