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