Merge "Revert "  Trim after explicit gc.""