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

Change-Id: I08a266eb804324c5e03543a5e7782f03a37a84e0