Merge "bug fix: close file pointer" into oc-mr1-dev am: 22898c0ed7
am: 6de8410c3e

Change-Id: Ied2620d4f39f17036e17ea547d4e5b2338b67d65