Merge pull request #13218 from apolcyn/bump_v17x

Bump v17x branch to 1.7.2