XFA: merge patch from CL 727083002, zero local variables.