Merge "sdm: Fix lint errors."