Merge "Update Feature Abort logic for vendor command messages"