Merge "Use SubscriptionController instead of SubscriptionManager." into lmp-mr1-dev