DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: 8db54315a0
am: c0411106a9

Change-Id: I9b4f33e8726faeedc3e00d00a1ff69826e7467f4