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
am: 770db6c070  -s ours

Change-Id: Iebf45ac3bb3f0b722b553b11d34e900e23a1b60e