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

Change-Id: I9781a2331af8cc5cecc653ec07cd89bc18193f3e