Merge "Wifi: Clean up APIs" into rvc-dev