Merge "Revert "Revert "Update SubscriptionInfo constructor"""