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