Merge "sdm: Fix compilation errors."