Merge "Remove CmHandle in DMI-Registry"