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

Change-Id: I08f2926703d2788ce6a201383555d80e4e4f228a