am 6de7bde4: am 0eb3e46a: am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev

* commit '6de7bde49b76542cadb9ad7d3b618df305cef9bc':
  Follow RegisteredServicesCache API changes.