am d3b87ec9: Prepare to make SubscriptionManager public.

* commit 'd3b87ec99d7c7fa61844c8d830808690542b843b':
  Prepare to make SubscriptionManager public.