BUG=359225

Change-Id: Idc4e2c8631925324a5e7e2a591bd6aa75169817a
Reviewed-on: https://chromium-review.googlesource.com/201890Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>