Merge "sdm: Correct issues reported by cpplint tool"