Merge "wifi: Update APIs usage" into sc-dev