Merge "Clean up SubscriptionInfoEntity unused fields" into main