R=sergiyb@chromium.org

Bug: chromium:848028
Change-Id: If8ce38ff0e991e171eae68e2bea708365e63a35c
Reviewed-on: https://chromium-review.googlesource.com/1099601
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53719}