Merge "Fix unintentional fall-through in switch."