Merge "Re-enable memory_tracker"