[automerger skipped] Mark ab/7061308 as merged in stage. am: 6bdf99a786 -s ours

am skip reason: Change-Id I727dffd0234e766cbc528ddc78e4c99d2b2afcbf with SHA-1 4e713ba768 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cce537bc1dd3e50079ba9223845889642a765ab