Merge "Use cpu_number to index mapping" into udc-dev