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

am skip reason: Change-Id Iadd2908cdd270f4e1f8a714b334069c493f836f0 with SHA-1 6e2a98f84b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia680744a466587c42e169aaa77e3de7d7694bdb9