Tracking with AOKP changes