Merge "Allow default phone to be used for per device API" into udc-dev