Merge "sdm: Fix lint error with proper includes"