DO NOT MERGE Add CTS test for URI fix.
am: 36c5e0d87f  -s ours

Change-Id: I3f40aa91536bde04f153c3f0d6c218b556d40238
tree: 146373b019a4908790b019644ebfdd0db18b0aff
  1. tests/