R=tandrii@chromium.org, vadimsh@chromium.org

Change-Id: I1f235cf959e92e4430cff7dcd0d292db1721319d
Reviewed-on: https://chromium-review.googlesource.com/c/1257585Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>