BUG=None

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