Merge "Remove aai repo references aggregated in common"