BUG=693030

Change-Id: I01ae922ce48f40e28ebdb9bcc08d5964f6bc676c
Reviewed-on: https://chromium-review.googlesource.com/444308
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Sergey Berezin <sergeyberezin@chromium.org>
Reviewed-by: Daniel Jacques <dnj@chromium.org>