R=clemensh@chromium.org

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