am abd0c099: am 45ed828a: am c85e16ca: Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev

* commit 'abd0c099c75d85ebca9281c7937b5b5b86f6066f':
  Make RegisteredServicesCache multi-user aware.