DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours
am: dfbb7a24e1  -s ours

Change-Id: Id23f5b58c058be206490b403981c850edff8f338