R=clemensh@chromium.org

Change-Id: Ib6f0c0de813049192ea99b194d5ef4b17d44cd72
Reviewed-on: https://chromium-review.googlesource.com/939784Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51632}