R=clemensh@chromium.org

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