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

* commit 'd1ce7256133616c98b1afce83a4ee19d83f9700a':
  Remove unnecessary allocation of FileMaps