[automerger skipped] Mark ab/7061308 as merged in stage. am: 573989abdc -s ours am: e188b606b4 -s ours

am skip reason: Change-Id Icd82b8879d3d37fd9218c0a0fb4125d433b5f76a with SHA-1 4071936079 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie030056b73a0c812c36e9ce604d7617634e583d8