BUG=505317

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