Merge "Add else branch to avoide fclose(NULL)" am: 10b043bb13 am: dded161774 am: 903044c667
am: f7e0b5185e

Change-Id: I63549a1b35a0ffb82f90f0cf0ea0fdc5005f4943