Merge "Fix unit test error for ns heal"