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

Change-Id: I1b319e1ee4806d7a513bcf6741240990eab74537