Merge "Remove all refs to carbon branch for packaging"