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

Change-Id: Ia982475c994fc82c8b6ee5a6a97086c4104a829e