Merge to XFA: patch from issue 692533005

Review URL: https://codereview.chromium.org/706993004
1 file changed