Merge pull request #10623 from mkruskal-google/sync-stage Integrate from Piper for C++, Java, and Python