am 235b01e3: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
automerge: 42b3b87

* commit '42b3b874800bfe853f793eba8682a2298e58aab6':
  Revert "Additional changes to SubscriptionManager API as per API council."