Merge "wifi: Use new API for wifi data usage function"