DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours
am: efb0258e08

Change-Id: Ied68f3ae10135b491ae4583eacd8f8bceaa76c5e
tree: 6b5eebb8d730724770759b68e0767d0c0618b1c7
  1. tests/