DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours am: 50ec90be8d  -s ours am: d5544e43e2  -s ours
am: 16488117dc

Change-Id: Iad1dd95c87dd38c8162c07f894245410890d1949
tree: b64a77eba9658c782f258e9b28cc11ef423fc769
  1. tests/