initial AOKP changes