Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev