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

* commit '81b6d8632def38f9113c7267da80d8d2e0fb1b62':
  Introduce unique_fd