R=clemensh@chromium.org

Change-Id: I2ec2fdb2406efeaf3b48d0c58711db7e5172aa58
Reviewed-on: https://chromium-review.googlesource.com/c/1335699
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#57525}