Merge "bug fix: close file pointer" into oreo-vts-dev