Merge "Protecting VmsSubscriberManager with the future annotation and future flag."