TBR=bmeurer@chromium.org
BUG=chromium:619538

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