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

Change-Id: I4dc3c02ec3b3abf2ccd880a7a46cf30d1db6a2b0