R=ahaas@chromium.org

Change-Id: Ie2e7f1c527c69ddc998d9c2437475ccea26ebb86
Reviewed-on: https://chromium-review.googlesource.com/570045
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46647}