DO NOT MERGE Add CTS test for URI fix. am: 5470431480  -s ours
am: 12b680a2c8

Change-Id: Ied68f3ae10135b491ae4583eacd8f8bceaa76c5e