R=clemensh@chromium.org

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