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

am skip reason: Change-Id I7f701c7f4ca6b20d3fe9abebb7220eaabfcd0e6f with SHA-1 c44541c792 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib720df01af70d2e916f25e0aab8f84c45e762fc4