tracking a few more from slim
Merge branch 'wx44' of https://github.com/WeaponX1/android into wx44