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 am: ca0bfec15d  -s ours am: 482d1b4a62  -s ours am: 6f2dd6d138
am: c9cba0429d  -s ours

Change-Id: Ie96561e59b9fa7e303680b2300268339bbbb1237
tree: e5f80f1c4246d14fb520cb677b261d5e47acc301
  1. tests/