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

am skip reason: Change-Id I33b37419913bbd397207fb53212488ea3885aedd with SHA-1 8ba2a45e2b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifeb855e2c344ae7d137dab2d0382e1c9fa8fcfef