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
am: 8889bedf05  -s ours

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