Merge "bug fix: close file pointer" into oc-dev
am: 8735fb45a5

Change-Id: I7ca0f4992804da30eaac7ca24b2dbe9004a5ac55