DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours am: d89f75a3db  -s ours am: db4ab12068  -s ours am: 7c6875bef1
am: 626d5efb37  -s ours

Change-Id: I74e639824511ae90674b36aa1fe80f605a2b27a7
tree: b576f546f237f9b09763a608014a1417f3e449f4
  1. tests/