R=machenbach@chromium.org
BUG=chromium:645890

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