R=marja@chromium.org

Change-Id: I91da3f653cda2ca428be578b4cf9a37e784c70d8
Reviewed-on: https://chromium-review.googlesource.com/667108Reviewed-by: Marja Hölttä <marja@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48025}