R=herhut@chromium.org

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