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

Change-Id: Ic69f502abf381a46dbcb25e18fdf77f63ccc98a0