DO NOT MERGE Add CTS test for URI fix. am: 473b117757  -s ours am: 9404d961c9  -s ours
am: b1b9a9a514

Change-Id: I994db8bc76d71aabcd14acd4082d1d24d8971067