Merge "sde: Fix klocwork errors"