R=sigurds@chromium.org

Change-Id: I7df887f84024831b4c55b3468bd54429280dd14e
Reviewed-on: https://chromium-review.googlesource.com/1167054Reviewed-by: Sigurd Schneider <sigurds@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54977}