Merge "sdm: Fix style errors"