am 27959e76: am d1ce7256: am 4b8b148a: Merge "Remove unnecessary allocation of FileMaps"

* commit '27959e76750f5c2073b1bb3ea193619d11d418cb':
  Remove unnecessary allocation of FileMaps