Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256
am: 15f2244696

Change-Id: I220aa6cbd2de6ac74a409d6be5aa62c331931929