Merge "Fix implicit fallthrough warning."