Merge "sdm: Correct time calculation logic"