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

am skip reason: Change-Id Icbf34e145538b85a23872d44352c5b2e3eff4f9e with SHA-1 ef8e754ddb is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I463706017f37cc666ead90ebebece7e1b62ef43c