Merge "Fix incorrect error checking on unique_fd" am: d2515c56d4
am: 3a431be49b

Change-Id: I147a5d51706e80e967cd91477f837b6ac1c1d0f1