R=jarin@chromium.org

Change-Id: Idf47ac88099915bd6db3621230c4f93f2bd7d3bd
Reviewed-on: https://chromium-review.googlesource.com/665117Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48008}