Merge "wifi: Change WIFI_FEATURE_XXX type from int to long" into qt-qpr1-dev am: 0710a7e6de
am: cd084d5ce8

Change-Id: I77e94db2097b33bbb8cf17fa254ac59cc6257f4a