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

Change-Id: Ida58f95f1dd66cf6638d8dea628084b39ec5d1d8