BUG=540829

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