XFA: merge patch from CL 815103002