am 25af9997: am c4554b9a: Keep track of remaining fd when devices are removed

Merge commit '25af9997b91a2cc5de8ffdaff072552492fb6312'

* commit '25af9997b91a2cc5de8ffdaff072552492fb6312':
  Keep track of remaining fd when devices are removed