Fix SF (run ant format-source)

Pushed to upstream