DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours
am: 50ec90be8d  -s ours

Change-Id: Ifcf62d3d2b4e46734419677980da68bcaf9c6f45
tree: b64a77eba9658c782f258e9b28cc11ef423fc769
  1. tests/