R=clemensh@chromium.org

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