#minor-release PiperOrigin-RevId: 509789955 (cherry picked from commit 4759e0075c4a4ac2fe8892147fed1ac341b48c0d)
#minor-release PiperOrigin-RevId: 490202192 (cherry picked from commit 6f1cf6dab4dd7e37e5d2ea15ad0cc34eafba601c)