R=clemensh@chromium.org

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