Fix compile for AICP

Change-Id: Ic1499c93731dc7e47099c8476a8c5a26849aa1cc