BUG=516027

Change-Id: Ibbf45c863570581ea79e198604cd4c5cc1836620
Reviewed-on: https://chromium-review.googlesource.com/289996Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>