Merge "wifi(implementation): Remove unnecessary local variable" into oc-mr1-dev