Merge "wifi: extend feature flag from int to long"