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

Change-Id: I71f9c69b951e5ab1add383d5f26f7bdcbc4fe519