Merge to XFA: Land patch from issue 854603005 at patchset 1 (http://crrev.com/854603005#ps1) on behalf of qsr@

TBR=qsr@chromium.org

Original CL at Review URL: https://codereview.chromium.org/852983003

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