R=dnj@chromium.org

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