Merge "[Wi-Fi] Remove redundant code" into rvc-dev