Merge "Deprecate INetd for devices after version 7"