Merge "sdm: Appropriate handling of buffer deallocation on valid fd."