R=marja@chromium.org

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