Merge "Introduce unique_fd" am: 9a6b8eeb44
am: 47f25063af

* commit '47f25063af13ba4ee12fb886518b9f8cd288fed1':
  Introduce unique_fd