changes from aokp and branch update