BUG=chromium:616035
TBR=kjellander@chromium.org
NOTRY=true
NOTREECHECKS=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2072833004
Cr-Commit-Position: refs/heads/master@{#37054}