R=jarin@chromium.org

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