DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: 8cb75edc3a am: 43aea5638c am: e37b9c0c15 am: 7529662078 am: 4173b8bf71  -s ours am: 6dc8d5cc2f am: b4f3cd6459 am: 8c34694796
am: ef98ca7cab  -s ours

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