R=machenbach@chromium.org

Change-Id: I48b6bda0bfb3c8aef117616015ee4225d4bdecfc
Reviewed-on: https://chromium-review.googlesource.com/517486
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45562}