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

am skip reason: Change-Id I0362ce60cec5cb167af801f36340418d34c28fc5 with SHA-1 9cd3b671b2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10649873ff5a1f0269f358d16dfbc4afd63f7e98