am 4879328f: Additional changes to SubscriptionManager API as per API council.
automerge: 7559036

* commit '7559036a139ed606f5fa2a118438c1d661b00347':
  Additional changes to SubscriptionManager API as per API council.