Merge "Fix VTS failures on tests with optional inputs" into oc-mr1-dev