Merge "Free config file buffer in case of error"
am: a0cd740f8b

Change-Id: I290eed44bc3bb44a7d245176091b041e7990622a