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

am skip reason: Change-Id Id6b9447f88cfe65c8b4e3b617cdd915688f77b49 with SHA-1 30f1b1b78e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28413da832609a03d2652dfea33727bba166bbd5