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

Change-Id: I9ea13826711bdd57ed05cc668af89bed10cf5165