R=iannucci

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