Merge "Fix disagreement of client_id/app_data pointer semantic"