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

Change-Id: Ifd9c9c987d3ebe16d615e8b8a51087ed9d73fc14