BUG=693030

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