[automerger skipped] Merge "Always close file descriptors" into pi-dev
am: 8fe381f0fd  -s ours

Change-Id: I831da822dea43107aafd6a5ad54a4a7832d0699a