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

Change-Id: I1c7daaca09eedd880c06960e5c5db8f4533696f4