Merge "diag: Prevent accessing uninitialized diag_md_info member"