Merge "Merge "Fix memory leak in error case" into klp-dev am: 5136b743 am:...

Merge "Merge "Fix memory leak in error case" into klp-dev am: 5136b743 am: 60657857 am: 55057ab4 am: a2fbd251 am: 4bd71033 am: dd2f7e98 am: 00be42f3 am: e4b59cb2 am: 15f22446 am: 6721b029 am: 7c3b4754 am: 0967b342 am: b47837e3 am: cc8ee0ef am: 1182c9d9 am: 65098155" into oc-dev-plus-aosp
am: 41e635dc

Change-Id: Ifd03e0473e444bb29eff2ec9e7c3629716cfbba9