[REFACTOR] Remove extra spaces

Change-Id: I315addc8efa31b6681b53bb44c764277590c4005
8 files changed