Merge "Remove hardcoded <kernel> version from fwk comp mat" into oc-mr1-dev