Track inline with AOKP

Change-Id: I707b74a283c1ae4e7265bb3722837ee4ed616dd4