[automerger skipped] Mark ab/7061308 as merged in stage. am: 5f5e73ee35 -s ours am: 50b60cdd4d -s ours

am skip reason: Change-Id I3a32e308046dfd304dec678a62cae7999c05c8a1 with SHA-1 eef807ea1c is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I340fbee642269e68a844185b425881ecd4933bba