Merge "wifi: remove legacy field merging codes" into sc-dev