DO NOT MERGE Add CTS test for URI fix. am: ff97586f -s ours am: 1565484c -s ours am: 17f7bd40 am: b7a93eb7 am: 548618a4 Change-Id: Ied1cebe11cbbc9703b390087b75a2ede4872174f