DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours
am: 9dc912e515  -s ours

Change-Id: I08182d4ead353c8fe59d54bac007586c6fa91b1d
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/