[automerger skipped] Mark ab/7061308 as merged in stage. am: d7f6702f40 -s ours am: 9beea376c0 -s ours

am skip reason: Change-Id I455613d78eaf2304ae128de324ecb337aade1464 with SHA-1 878758dadc is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I435b55b064664bf7fb37ce17d1b19b39383fea33