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

Change-Id: I46923e953fb02792d535b3e1ba0c5d5b7dc746d8