DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9  -s ours am: abd196715f am: d18aefffcf am: d1d09b39d9 am: a49852f69d am: 67b508b029  -s ours am: 0f7b85edfa
am: 48cde7b920

Change-Id: Ie39124290ae1423cb15022fb4a708929e9258bf1
tree: 6678dc9f5bb443088e8c2046cd627cef5bc101b2
  1. tests/