R=iannucci

Bug: 749709
Change-Id: I2b2dbde5ac74e20c36da0c691999f9dc09ea7ca5
Reviewed-on: https://chromium-review.googlesource.com/806996Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>