DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: d9ac06f2c2  -s ours am: bdf5a47c67  -s ours
am: 39127a559b  -s ours

Change-Id: I08a4c4ddb03510cfde3bb478bb41a051bc553059
tree: 4dc73dbab6acb2851f5ad24beb73edb13278a932
  1. tests/