R=clemensh@chromium.org

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