R=clemensh@chromium.org

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