DO NOT MERGE Add CTS test for URI fix.
am: a02bbf31c4  -s ours

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