Merge "Always close file descriptors"
am: 26025a06ec

Change-Id: Ib1d8f74832b8b649dc83de39f8f16651a9924e69