Merge "wifi: add WAPI helper method"