Merge "Fix CTS VLoadTest failures under debug context." into oc-dev