Merge "Add corresponding error code to fix vts test" into oc-mr1-dev