R=clemensh@chromium.org

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