Merge "Change to use memory_tracker variable"