Merge "diag: Close the read when buffer is already marked free"