Fixed issues with whitespaces

Change-Id: Ic8175d22ef2285f87cd2afcaced53838cc7371b1
Closes-Bug: #1328533
Merge "Fixed issues with whitespaces"