Merge "ServiceManagerProxy: New method implementations"