[automerger skipped] Mark ab/7061308 as merged in stage. am: e6d879d48c -s ours am: 6805237a2f -s ours

am skip reason: Change-Id I7c47a8719810947e97c5760bab6e8265141b4840 with SHA-1 da6c4c5b35 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4014d6edab2fb418cc000df894ea9850558a3c6b