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

am skip reason: Change-Id I4132725724422d8b3f72fb133c824b895ebc111e with SHA-1 c97ecd7a4a is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54df3a4907f258622aa21d37bf7183f3f55e8fa8