am 93cdf104: am 5cce4c75: Merge "Fix memory leak where we close the descriptor...
am 93cdf104: am 5cce4c75: Merge "Fix memory leak where we close the descriptor instead of the file."
* commit '93cdf104':
Fix memory leak where we close the descriptor instead of the file.