Merge "Remove unnecessary allocation of FileMaps"