Merge "Fix 2655246 file descriptor leak when accessing thumbnails http://b/2655246"