R=ahaas@chromium.org

Change-Id: Ie8407bb05dc0a1aeda4066f29e239e9ee085d946
Reviewed-on: https://chromium-review.googlesource.com/c/1369955
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58135}