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

Change-Id: I4cdcb7694baea6c10980860880c4bdcf41905a8f