R=ahaas@chromium.org

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