[automerger skipped] Mark ab/7061308 as merged in stage. am: d31e1e5594 -s ours am: 0613875b77 -s ours

am skip reason: Change-Id I5b5abaa267515d5c92a51a0a5e2ad51bd7a4675c with SHA-1 4ba8bb3651 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I689d5fe433b942e8e50823517d89dd4443479bd5