BUG=504872

Change-Id: Ib69830a556fe06c111f41d78811c7115b0d8314c
Reviewed-on: https://chromium-review.googlesource.com/292450
Tryjob-Request: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>