Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
automerge: c29df2d

* commit 'c29df2dd1967bba40ff2a88dcab82c4f689eeb69':
  Additional changes to SubscriptionManager API as per API council.