R=nodir@chromium.org

Bug: 662654
Change-Id: I18898cb426ccbb895a82410dc61910a8b8e48f14
Reviewed-on: https://chromium-review.googlesource.com/517664
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>