BUG=crbug.com/854886,b/110032771
R=tandrii@google.com

Change-Id: Iabd67f8042ab3bc7c6ef15101effeeebf39d4500
Reviewed-on: https://chromium-review.googlesource.com/1111007Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Michael Moss <mmoss@chromium.org>