BUG=505308

Change-Id: I34ae3aa65ce55c4e04eecfef3c9cde9841e47140
Reviewed-on: https://chromium-review.googlesource.com/288245Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Daniel Cheng <dcheng@chromium.org>