R=clemensh@chromium.org

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