R=clemensh@chromium.org

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