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

am skip reason: Change-Id I34aab72dc94ef82be99b3665e792d9eee2a3fc73 with SHA-1 008ae5c017 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92692f80a47c9803be68503cbed28be209ac0e26