Merge "bug fix: close file pointer" into oreo-vts-dev am: e4fb4e20e7  -s ours am: 13d2ddbaf8  -s ours
am: d37bd7afcd  -s ours

Change-Id: I36e751ebff10dda604c93206626d80a775eb3fa8