9cddfa7
New upstream version 1.17.42. (cherry picked from commit 29f3238199192bf34f8dadcc43d30a3d3f9ae000)