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

Change-Id: I1a2e5c168e011aa9e4b5cda1cc264293ec32e834