merge changes with aokp