Merge https://codereview.chromium.org/897973002/ and https://codereview.chromium.org/902753002/ to XFA branch

R=jochen@chromium.org

Review URL: https://codereview.chromium.org/887073005
8 files changed