Merge "msm: net: Support for Removing SFE module"