Merge "Use the correct subscription id" into udc-dev