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

Change-Id: I4d696f302b745c844bb049556f17bb87f828c64a