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

Change-Id: I26d7d4dd3d6eb4ef7d91b302911b8f848dcd1931
tree: f053791b2ab65c58895d16b53dad660248e0a11b
  1. tests/