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

* commit 'a74be3623ad167b3e380302d03253d0b269426a7':
  Allow "_" in URIs.