Merge "Add missing clean-up of idmap file descriptors."