Track back AICP_OTA

Change-Id: I1de5ae01d381232619207dc93ee05a4f9788a122