Merge "CDD: Renumber Resources in the CDD" into mnc-dev