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

* commit '85c7ca268366d58f8f82524d9db03ba09af27436':
  Additional changes to SubscriptionManager API as per API council.