Merge "Do not crash SubscriptionManager clients" into udc-dev