[automerger skipped] Mark ab/7061308 as merged in stage. am: 2e4f7b31f1 -s ours am: 7e1045ffbb -s ours

am skip reason: Change-Id I34dc1397fe2214681e674fe1122b3e7b41bffbfc with SHA-1 549fead606 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia62a51261810c17fe79761b319260639232bfc1f