R=jarin@chromium.org

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