BUG=chromium:668223

Change-Id: I2068370f3e6963f297d0cb6545c40abf84d543ce
Reviewed-on: https://chromium-review.googlesource.com/421092
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>