Merge "Fix incorrect case statement."