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

Change-Id: I91c8b5047f5dc181b788415e4f09cef4f1c2d417