Merge "wifi: correct WPA cipher GCMP-128  bit" into sc-dev