Sync from Google-internal development.