R=clemensh@chromium.org

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