Merge "Fix implicit fall through switch cases."