Merge "Always close file descriptors" am: 26025a06ec
am: de8eac9ae1

Change-Id: Id25f948b6b4d25ac033d9b608ab4a6b474f2c606