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 am: 6721b0295f
am: 7c3b47540e

Change-Id: I7af91e2469b5e7e3b7a2d4f0e65cb9620bfe037c