BUG=634946

Change-Id: I1724395d6ba223854e513543841bdbb317f3ede7
Reviewed-on: https://chromium-review.googlesource.com/410227Reviewed-by: Andrew Bonventre <andybons@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>