BUG=chromium:834269

Change-Id: Ia49f80f4c057ad467428a13e8cd4ca54ad48d5c4
Reviewed-on: https://chromium-review.googlesource.com/1058084Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>