DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours am: ca0bfec15d  -s ours
am: 482d1b4a62  -s ours

Change-Id: Ia18553aebf6e6306ce3e3e590ad6f2972c73a1bb