BUG=chromium:619503
TBR=jochen@chromium.org, vogelheim@chromium.org, dpranke@chromium.org, thakis@chromium.org
NOTRY=true

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