BUG=605775

Change-Id: I0e23fae25d450c504f174a080279cf51aebcd123
Reviewed-on: https://chromium-review.googlesource.com/340112Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>