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

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