DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours
am: ad0b72a35f

Change-Id: I05c2d8d1f16fd20991d72765fd960695c40e4fcf