[automerger skipped] Mark ab/7061308 as merged in stage. am: 916b7cb94f -s ours am: e4888d4634 -s ours

am skip reason: Change-Id I2eef5c541e2d5eafb3edc4a47da524684d126044 with SHA-1 f47cc815ca is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie442c79b0eb2fc192b1ee2376cc7393c0e3baa77