BUG=505309

Change-Id: I0e93139693206e766b91a5998d6e284c7a29fd14
Reviewed-on: https://chromium-review.googlesource.com/282450Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>