Merge "[MEP] sort the simSlotMapping by logcal slot id" into tm-dev