TBR=nodir@chromium.org, tandrii@chromium.org

Bug: 790434
Change-Id: I6185d79594f63a4652d458d33f9fed325b8d3b85
Reviewed-on: https://chromium-review.googlesource.com/1103302
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>