Merge "fixed nssmf init and update ResourceOperationStatus fail"