Merge "Bug 5953: Fixed NPE in FlowRemovedTranslator."