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

Change-Id: I620df55b98e3f07ddd4329b533770fcdc9874a11