Merge "Change resource name per GMS requirement" into udc-dev