Merge changes I8555310a,I3d3bcfa3 into main

* changes:
  Rename ServiceManagerShim to CppBackendShim
  Change constructor of ServiceManagerShim