Merge "fix(xlat): fix defects on the xlat library reported by coverity scan" into integration