Merge "Modify SetDefaultPortParams test" into oc-mr1-dev