am 3fdec6f0: Revert "Additional changes to SubscriptionManager API as per API council."
automerge: d028459

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