R=leszeks@chromium.org

Change-Id: I74ea24beb97976674891d869cbcad341c1eb4a05
Reviewed-on: https://chromium-review.googlesource.com/737996Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48961}