Merge some changes from AOKP