R=clemensh@chromium.org

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