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

Change-Id: I556b7871c6336c76c15559540534fee5016128f3
tree: 4dc73dbab6acb2851f5ad24beb73edb13278a932
  1. tests/