Merge "wifi: Use new API for data usage function" into sc-dev