R=jgruber@chromium.org

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