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

am skip reason: Change-Id I14449a3c809ff694be3442e54d402e10a84b3848 with SHA-1 45646d5322 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1009e7c4af7b4883da5e5adae6d81ea5cbfff2c1