halo. what else, style changes

Change-Id: I8d82844c45edd3ce5f73bfed875b8df191defe11
Merge 4.3_r2.1 with conflicts

Now the hard job begins!!