Merge "Add additional meminfo fields to SystemMemory"