Merge "Simplify the memory metrics atoms."