AICP all the way !

Change-Id: I3b82f6ce21cd187256e37891681f2485dc9c1900