R=jgruber@chromium.org

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