AOKP->AICP conversion

Change-Id: I401cb249f0f63bfa28c01594d72ac0aa29be578f