Merge "Use default URI instead of string name." into lmp-mr1-dev