Merge "sdm: Resolve mismatched deallocation of memory" into dev-2.0