Merge "Remove OCICUC from build and repo"