R=clemensh@chromium.org

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