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

Change-Id: If5c07b70bdcffe6d099b7a2ef3da6dd12635fc97
tree: f053791b2ab65c58895d16b53dad660248e0a11b
  1. tests/