Merge "DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: df249cbcbb  -s ours am: cebea26b62  -s ours" into oc-mr1-dev
am: 3cfa3d6076

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