Merge "[MS30] Remove ServiceManager#getService dependency"