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

* commit '0eb3e46a49af423f5d17b81d487224dab214786f':
  Follow RegisteredServicesCache API changes.