Merge "[satellite] Removed hardcoded package name" into main