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

am skip reason: Change-Id I22df19a1f52378c5d87d318113450c433bb6a3a8 with SHA-1 e574f4c353 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idef296fea7526a9f78f2ecab456d2fc4e8dfa0d7