BUG=635641

Change-Id: Ibfeda2ab32d10a8a4e229a428a846ce9809e8dcd
Reviewed-on: https://chromium-review.googlesource.com/444094Reviewed-by: Daniel Jacques <dnj@chromium.org>
Commit-Queue: Ryan Tseng <hinoka@chromium.org>