DO NOT MERGE Add CTS test for URI fix. am: 473b117757  -s ours am: 61b33ddbf2
am: fae5ab224b

Change-Id: If5564c72df38a86cdea19d0e3f54585a46d5246c