am 66128af9: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 29bb86a

* commit '66128af92b8847253678c32d042130e4d9679281':
  Revert "Additional changes to SubscriptionManager API as per API council."