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

Change-Id: I01480a11a3c926c4eb295e6ae450b8bbec61ed14