Merge "sdm: Fix KW errors"