updated to build in 26.04#3

paul-doughty wants to merge 2 commits intoWDrijver:mainWDrijver/ApolloCrossDev:mainfrom

paul-doughty:mainpaul-doughty/ApolloCrossDev:mainCopy head branch name to clipboard