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
am: 4173b8bf71  -s ours

Change-Id: I6093940b82b4e530332665731c56905a2c1c891a