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

am skip reason: Change-Id I895e9e3bb0bec7fbd39e69112d11f68b9a9ad850 with SHA-1 126e8d4277 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97db824ccd725681952310f66df2a66ef41e44cd