Merge "Fix AAI Service Delete failed issue."