Merge "sdm: Handle commit failure from comp manager correctly"