DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: 8cb75edc3a am: 43aea5638c
am: e37b9c0c15

Change-Id: Ifb4d28de149b96376bd01d0dae82e2ea4677c67e