BUG=None

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