Merge "Revert "Added builder for SubscriptionInfo""