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 am: 2181876b7e  -s ours
am: 09167ba006

Change-Id: I22769728e593d7d5dd8956448306c235b7544567
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/