DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours
am: 50ec90be8d  -s ours

Change-Id: Icbd26abefd92d483a221ee527ceec1dd4ea34e41