BUG=320021

Change-Id: I97cdd65ac17ee142700dbf0f363891500e967571
Reviewed-on: https://chromium-review.googlesource.com/184205Reviewed-by: John Bauman <jbauman@chromium.org>
Tested-by: John Bauman <jbauman@chromium.org>
(cherry picked from commit 93f01ca0)
Reviewed-on: https://chromium-review.googlesource.com/188660Reviewed-by: Shannon Woods <shannonwoods@chromium.org>