R=jarin@chromium.org

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