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

Change-Id: If917dbb56d4cc2758d7b29eee60ae3036d13118a