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

Change-Id: I7074249dbbc3cd533b15e04a2764948302d86b4d