Removed some duplicate spaces

Change-Id: I4e4ed2399cb7dd2b7f38cdedf53c227fd752e569
Merge "Removed some duplicate spaces"