* commit '12c2136e556b54a717624d8479ec4650f363ce45': Additional changes to SubscriptionManager API as per API council.