R=herhut@chromium.org

Change-Id: I9c67227da8d304a805f7f25fa64862ee400530d7
Reviewed-on: https://chromium-review.googlesource.com/1149820Reviewed-by: Stephan Herhut <herhut@chromium.org>
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54714}