R=tebbi@chromium.org

Change-Id: Id524c8239f99fc26ac5cd19cbdea39dba62f2c3f
Reviewed-on: https://chromium-review.googlesource.com/1071650Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
Commit-Queue: Simon Zünd <szuend@google.com>
Cr-Commit-Position: refs/heads/master@{#53331}