R=machenbach@chromium.org

Bug: chromium:747960
Change-Id: Id4e3b976e2600b075a3ef5b719490a9d749b3760
Reviewed-on: https://chromium-review.googlesource.com/813837
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49931}