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

Change-Id: I65c91a852c2e7f580a2b58098786b9e39d380d10