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
am: 32f35ba810

Change-Id: I655abe03c7c2b73e4e13525d9f5477e33af2fe69
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/