Merge to XFA: patch from CL 758593002