Merge "Revert^2 "Reduce the number of calls to Jit::AddSamples.""