Merge "Ignore getService deprecation warning in IServiceManager"