BUG=361931

Change-Id: Ib44667422f524e5dcc3035692e8f725c24e92821
Reviewed-on: https://chromium-review.googlesource.com/194981Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
(cherry picked from commit 6795ca48)
Reviewed-on: https://chromium-review.googlesource.com/197251Reviewed-by: Jamie Madill <jmadill@chromium.org>