am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."

* commit '87d86044c0f15ae2ffc0350271c76ff874fb413b':
  Add missing clean-up of idmap file descriptors.