am af964a63: (-s ours) am af50821b: DO NOT MERGE MTP: Fix file descriptor leak...
am af964a63: (-s ours) am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
* commit 'af964a63':
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions