Merge to XFA: patch from CL 787753002