Merge to XFA: patch from CL 791223002