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

am skip reason: Change-Id I6ddf4f417f3f0a994077f0a8140bffd2baafe0aa with SHA-1 85ec5c0516 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fc18f8971cfbaac6b91cc68dc0d5cfe1c889e45