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

Change-Id: Ia0ec90fe324c7ec87eb42de42754f15bdc3fc0be