Merge "Add missing break statement" into oc-mr1-dev