Merge "wcnss: Fix for Static analysis issues"