[automerger skipped] Mark ab/7061308 as merged in stage. am: 8645f13d23 -s ours am: 7081f140f3 -s ours

am skip reason: Change-Id Ia85137120a02a35eb7f9d531b3c35ccccd6a423d with SHA-1 aeb9d0b6ac is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I435a56cd7b884bf8ef7df246c7f7a3aea91d709f