BUG=602737

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