Merge "correct the channel numbers for bands for softAp" into sc-dev