Merge "DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours am: 50ec90be8d  -s ours" into oc-mr1-dev
am: e0dd5c34bb

Change-Id: I8dd8ba3804c07aa27637aec2e24692d007f39554
tree: 707c36f79dc5fd1297e2f970ac6d9f6c5a33e571
  1. tests/