Merge "Re-enable file descriptor caching and add option to skip caching"
am: 1a043459a9

Change-Id: I99e6436ec96321b0b2d17499dc72140c4635ce1e