Merge "hal: Fix incorrect wsa count update during platform_init"