Chores removing wait of vapb deletion, cherry-pick (#3718) (#3724) #3724 (Jaydip Gabani) Prepare v3.18.0-rc.1 release (#3725) #3725 (github-actions[bot])