Merge "Create Configuration overrides for MCC/MNC values" into tm-qpr-dev