R=clemensh@chromium.org

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