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