Clean up local variable usage - Swift

Change-Id: Id02ebdfa5cb3f6c763293876c6bb031184ebd663
Merge "Clean up local variable usage - Swift"