automerge: e76308c * commit 'e76308c5d62984132192119f3d0bc407f89a2100': Update SubscriptionManager API as per API council.