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

Change-Id: Id7e4186c3f5705fee1c30c4f96f7041443c24023