Merge "Fix incorrect closing of fds." am: b5d064f5c6
am: 927b30bb1d

Change-Id: Icecdcee39a4248cba9d643b7566a663446557aaa