Merge "Bug fix of 6GHz band channelization"