XFA: merge patch from CL 761313004