am 864f49d8: am c34c79fc: am cf229bb0: make consistent with new RegisteredServicesCache API

Merge commit '864f49d8e9b5bd2a30ac8414822889d0ffd0ba0c'

* commit '864f49d8e9b5bd2a30ac8414822889d0ffd0ba0c':
  make consistent with new RegisteredServicesCache API