BUG=None

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