automerge: 1caab41 * commit '1caab41f31b2fd1129dff58fc678361b691af9db': Revert "Additional changes to SubscriptionManager API as per API council."
automerge: 1caab41 * commit '1caab41f31b2fd1129dff58fc678361b691af9db': Revert "Additional changes to SubscriptionManager API as per API council."