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

am skip reason: Change-Id I26b1558a55c190b1d47b5f65a6ef33c92fce0127 with SHA-1 3f8f990e61 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2df7208f68674837836db8823472b5c360ee6bc7