BUG=2122

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