Merge "Prepare to make SubscriptionManager public." into lmp-dev