am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev

* commit 'c9ff3bce8b398252ee2978cca43b5ec88937f1ab':
  Follow RegisteredServicesCache API changes.