R=jarin@chromium.org

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