Merge "Sync proto from google3"