[automerger skipped] Mark ab/7061308 as merged in stage. am: 20522ba3ac -s ours am: 875556760e -s ours am: 339c73d618 -s ours

am skip reason: Change-Id Ia3ae9ad664d1cc012f356929eb3f3064dd710d96 with SHA-1 2a8b7d749f is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63a7073949c2bc638ff78fd9c7acc86d6ada62f9