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

Change-Id: Ie52700a144ec6c153391b2d624179ec50c36bc0a