Merge "Fix accidental implicit fallthroughs"