Merge "Fix implicit fallthrough warnings."