Merge change 3533

* changes:
  Use new wifi cmd rssi-approx when polling.