Merge "sdm: Fix SDM Dump() design and synchronization issues"