Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." into sc-dev