e42b9cb
New upstream version 1.17.31. (cherry picked from commit efb8a98f320c1f2ac67ae9fd7c47fd42e5908bc1)