Merge "adding cps-ncmp-dmi-plugin"