DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours
am: d9ac06f2c2  -s ours

Change-Id: I67feb6491c120e42f274aa78e553a3127cbe475e