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

Change-Id: Ie5f8bf09bdb80355c9eac6d5361f089411216ad5
tree: 437a5c2b9bb14a7ffac6c80b297d67d10065ee21
  1. tests/