This change brings updates from the 'f/trixie' branch into 'master' to ensure consistent functionality and packaging structure across both branches. Test Plan: PASS master trixie build Story: 2011360 Task: 53260 Change-Id: I5f25556564d2c78256961aa95329096cea821222 Signed-off-by: Sai Lakshmi Teja Vanka <SaiLakshmiTeja.Vanka@windriver.com>