For some reason some of the code was not formatted with rustfmt.  Maybe
rustfmt or it's config has changed, or we forgot to run it.

This change is a noop - just formatting changes.

Change-Id: I86c480b5aa74bbf5c6c33940b9628382f473b20c