Merge "DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: d9ac06f2c2  -s ours am: bdf5a47c67  -s ours am: 39127a559b  -s ours" into oc-mr1-dev
am: e06726e055

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