AOKP changes

Change-Id: Ia9ce98e2d77c340b2a3ca4e3e02ea75bd2158eac