am 4b8b148a: Merge "Remove unnecessary allocation of FileMaps"

* commit '4b8b148a8cb6c6044e64cf3c8834ebdcdf6de9dd':
  Remove unnecessary allocation of FileMaps