Merge pull request #8502 from haberman/sync-stage

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