Merge "Remove references to $(ACP)"