am f9e4afff: am bb23450e: Merge "Allow "_" in URIs."

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