[automerger skipped] Mark ab/7061308 as merged in stage. am: 499b9190d9 -s ours am: b0b329e052 -s ours

am skip reason: Change-Id Ib7f8bcd011f792265fb1c0d944a2c27f42a90d8d with SHA-1 a28dfa75c5 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33f4945b7e9e56d7eeb0a80da7c226ddea115b94