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

am skip reason: Change-Id I1803299b3be7e08fa7086cb04cff4003cbd8527e with SHA-1 8186814f93 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d4aa6774b10924390f231d6178187c5d9910642