Merge "Fix accidental implicit fallthroughs" into oc-mr1-dev