BUG=635641

Change-Id: I66f669ed45199107643fced174c0cd1b8eaa80ad
Reviewed-on: https://chromium-review.googlesource.com/444449Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ryan Tseng <hinoka@chromium.org>