R=ahaas@chromium.org

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