Merge with AOKP