R=jarin@chromium.org

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