Merge "Add a NOLINT for the memory leak we added"