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: ec320be2b3
am: 2ef4392dc8

Change-Id: I498193553e12829caa562aa8813325728c4dd9a3
tree: 6678dc9f5bb443088e8c2046cd627cef5bc101b2
  1. tests/