Merged https://codereview.chromium.org/922273002/ to M41

NOTREECHECKS=true
NOTRY=true

BUG=464672

Review URL: https://codereview.chromium.org/977273003
5 files changed