Merge "Implement unique_fd.ok()"
am: c9ec95272c

Change-Id: I6030fd103c9df905c84161817560c55330627345