Merge "Fix typo in in offload control VTS test" into oc-dr1-dev