R=jarin@chromium.org

Change-Id: I9b54049852696680fb7fde26813638aae727b5d3
Reviewed-on: https://chromium-review.googlesource.com/1158231Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54835}