Merge pull request #10636 from mkruskal-google/sync-stage

Integrate from Piper for C++, Java, and Python