BUG=None

Change-Id: Ibb3c6ea919c34e967aaa5d475d6e05249d2ee6aa
Reviewed-on: https://chromium-review.googlesource.com/309810
Tryjob-Request: Corentin Wallez <cwallez@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>