Merge "fix(spm_common): fix comparison that is always true"