Merge "bug fix: close file pointer" into oc-dev am: 8735fb45a5
am: 51f04884ba  -s ours

Change-Id: Iaa1a97e0771874b65adf0eab0a48de7eed78be6d