Merge "Add support for WPS2-PSK security type in Security property of service interfa...