Merge "Add ALLM and Content types in hwc2"