BUG=None

Change-Id: I52a9beeddfc83ee8711cc23979a97c79a4f22227
Reviewed-on: https://chromium-review.googlesource.com/358109Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>