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

am skip reason: Change-Id I26b0f374e227cba084ab4c794253a3d5347be363 with SHA-1 7310312ac1 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6394735b5e61cd68930099892afc0866843e3a2a