Merge "Fix test failure" into oc-dr1-dev