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

am skip reason: Change-Id I46d52b31f5a20aa4e3247b2948e3288d841271a8 with SHA-1 7adc6657fa is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idada2493966a8608e28571ae6f1ae46188bdff89