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

Change-Id: I04272404628d2e70286dc92df7439771d29499c0
tree: e5f80f1c4246d14fb520cb677b261d5e47acc301
  1. tests/