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

Change-Id: Ic8b3948c7e9f1aca59b506f3dd67c0176c73316d