This is a follow-up after https://chromium-review.googlesource.com/c/517049/

Bug: 727334, 570091
Change-Id: I49f9ad07f1b79cba547d88e93b2d2064c33e1f4b
Reviewed-on: https://chromium-review.googlesource.com/518125Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>