And fix some build errors caused by this update PR: 280080 Reported by: wen@ Exp-run by: antoine@ Approved by: portmgr(blanket, fix build)