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

am skip reason: Change-Id Idd7baf6bdb5337d2a4ea8099ff15f395047929f1 with SHA-1 9382cdc33e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30ad57ec893e7ce2e63da2ba8afbfcc5dd144e9f