DO NOT MERGE Add CTS test for URI fix. am: ccd5db3a51  -s ours am: 65408dc312 am: c0411106a9
am: 02a78c5cf9

Change-Id: Ica33341a957995a3d86c86e87d2b03b11b5a8e4a