Merge "Add pre-share key check for wapi" into tm-mainline-prod