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

Change-Id: Ib0df1d4ab2fe1352a1f2917cf041a8aaced052d9