R=clemensh@chromium.org

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