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

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