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

Change-Id: I882af9bdd65992b1de7c0e27e67d5094c2be2004