merge from AOKP