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

Change-Id: I9b4f33e8726faeedc3e00d00a1ff69826e7467f4