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

No-Try: true
No-Tree-Checks: true
Bug: 836232
Change-Id: I8f78eac1736d63625f00fd57dc38dcc15d5cb2c8
Reviewed-on: https://chromium-review.googlesource.com/1124559Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>