DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours
am: 7ae5d30389

Change-Id: I994db8bc76d71aabcd14acd4082d1d24d8971067
tree: 0d5b86e47b0e392dd53df20076168792b95573a3
  1. tests/