Merge pull request #8657 from deannagarcia/3.17.x-202105251932

Update version to 3.17.2