R=dnj@chromium.org

Bug: 754427
Change-Id: I46f3c757457a07e4639af6605c45cd907299e8b5
Reviewed-on: https://chromium-review.googlesource.com/611394Reviewed-by: Daniel Jacques <dnj@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>