am 5ce5ec95: Merge "Use SubscriptionController instead of SubscriptionManager." into lmp-mr1-dev

* commit '5ce5ec9540a827092774eac4d10c9055aa3ab317':
  Use SubscriptionController instead of SubscriptionManager.