Fixes for AICP

Change-Id: I36d27b08deef0997763f88049556a982b4891c85