Merge pull request #17623 from sanjaypujare/preRel-v.1.18.x

Prepare to release 1.18.x,  upmerge v1.17.x to master