R=jgruber@chromium.org

Change-Id: Ibb35c1ae090cd8e79e48c977735af1188414f531
Reviewed-on: https://chromium-review.googlesource.com/1105054Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Simon Zünd <szuend@google.com>
Cr-Commit-Position: refs/heads/master@{#53821}