push upto 3.3

great work slim team :)

Change-Id: Ie69ee839bd8607ba2c9571541acf10e679ae6c41
Cleanup and Tweak More

Change-Id: I0df9de5f14654860308b1bdb116a526058bcaacb
Merge remote-tracking branch 'slim/jb4.2' into mirage

Change-Id: I567ecae2eaf7df8b5c0929f7967a6d69ded22d5f