XFA: merge patch from CL 816593002