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

am skip reason: Change-Id I06014d32e131079e2eb02dac3029fc4691a6c9b9 with SHA-1 fcda898a4f is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I439246cc95bd5a70650c2b41afb48a3ab088e095