Updates from AOKP sources