Merge CM tree changes

Changes to use hw_get_module_by_class