Merge "Allow "_" in URIs." into lmp-mr1-dev