Merge "NFC: Fix implicit fallthrough warning."