Merge "Fix bug that was causing us to lose total memory buckets."