amami: AICPfying....

Change-Id: I8246ec011cc98f23ba7503756af87c275c4e5387