Move aicp import more up

Change-Id: If8b9b8cc500ed4d3a487d8cdb937c31746c75d88