swift_new: lint fixes

Change-Id: Id9317fce4bf196c1e1fc85d4f01a57acedc9880a
Merge "swift_new: lint fixes" into production