Merge "Fix inconsistent repository references"