Merge "diag: Add NULL pointer checks for upd buffer"