Merge to XFA: Land patch from issue 854603005 at patchset 1 (http://crrev.com/8546030...