Revert "Revert "removed whitespaces""

This reverts commit 4f75c79f7bc35c8833f71a944296008411cf3868.

Change-Id: I8d3cc6d8b74b347cdb20a779ebdddefd58ccbf41
Merge "Revert "Revert "removed whitespaces""" into jaf-1.1