R=marja@chromium.org

Bug: 
Change-Id: I641ca830bb11b91e7098ee8d2dbec5d523bbc879
Reviewed-on: https://chromium-review.googlesource.com/612082Reviewed-by: Marja Hölttä <marja@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47313}