R=clemensh@chromium.org

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