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: 53291 Change-Id: Iada9f42625573c5981e0d7e8bb9020f4ce8a4b91 Signed-off-by: Abhinav Ayyapasetti <ayyapasetti.abhinav@windriver.com>