Merge "Add <interface> / <instance> to fwk compat mat" into oc-dev