Merge "diag: Modify md_info and diag client map synchronization"