DO NOT MERGE Add CTS test for URI fix. am: ccd5db3a51  -s ours
am: 148c58bdb3  -s ours

Change-Id: Id23f5b58c058be206490b403981c850edff8f338