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

am skip reason: Change-Id Ie0f77abf4416296aef54b2519f5ec1db072b4fe9 with SHA-1 1967f06dd7 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b7ca63d479d67bb4d6c2713b5c7a1fab91bbffc