Merge "Add pre-share key check for wapi" into sc-dev