R=clemensh@chromium.org

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