Merge "wlan: Address timer leaks due to 64 bit compatibility issues"