Merge "Make members in SubscriptionInfoHelper non static"