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

Change-Id: I6641da7c3cad16b710db76465cb7bd79c4fb316a