Bug: chromium:701825, chromium:911856
Change-Id: Ic8d1ea35e0b21b481aab4c87037de6646ddfe450
Reviewed-on: https://chromium-review.googlesource.com/c/1372072
Commit-Queue: Max Moroz <mmoroz@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58188}