Merge "Disable Aggressive Trim by Default."