R=marja@chromium.org

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