Merge "Add <interface> / <instance> to fwk compat mat" into oc-dev am: 0fefa392f7
am: 8c25616954

Change-Id: I66e3b7be3dff6d156e6667856369374335860a19