Bug: 
Change-Id: Ic872ea78511f0ef3e8cea67b971162b71790a039
Reviewed-on: https://chromium-review.googlesource.com/781690Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Reviewed-by: Igor Sheludko <ishell@chromium.org>
Commit-Queue: Marja Hölttä <marja@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49564}