Merge "fix(spmd): fix build failure due to redefinition" into integration