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

* commit 'a6461bdafd083b329346f6f9c8b0f21a9cd40703':
  Use SubscriptionController instead of SubscriptionManager.