some fixes and uptream from cm...thanks

Change-Id: Ibbc3abdabb05099eece5ea9096ee079dc3d8c271
Merge "some fixes and uptream from cm...thanks" into jb4.3