BUG=605775

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