DO NOT MERGE Add CTS test for URI fix. am: ccd5db3a51  -s ours am: 148c58bdb3  -s ours am: d9ece5b2d5 am: 0884b97dbb
am: 404b991ca2

Change-Id: Ifb4d28de149b96376bd01d0dae82e2ea4677c67e