Fix whitespace issues

Fix issues reported by niceness gate

Change-Id: I6955e1ad27aa36effe13d5f7d7f5fbf5d9ec1f44