R=rmcilroy@chromium.org

Change-Id: I8c62ab212d9b741a5413b075ecbebee515161d6f
Reviewed-on: https://chromium-review.googlesource.com/771831Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49385}