BUG=361553

Change-Id: I6d3e843a8ae06f1bbd5313ed95e338cb0b74fef3
Reviewed-on: https://chromium-review.googlesource.com/194128Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: John Bauman <jbauman@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
(cherry picked from commit 74697cf2)
Reviewed-on: https://chromium-review.googlesource.com/195160Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Nicolas Capens <nicolascapens@chromium.org>