Merge pull request #7378 from haberman/sync-stage

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