cleanup Whitespaces

Change-Id: I475697e49c1b0cc0edbcb1bc7040e4e6be107454
Merge branch 'cm-11.0' into kk_mkt