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
am: 5615358c4f  -s ours

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