DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: df249cbcbb  -s ours am: cebea26b62  -s ours am: e104b8132d  -s ours am: afbc49ee96
am: e1e9960037  -s ours

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