Merge "Change MemMap::maps_ to not be global variable"