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

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