Fix memory leak in generate_key wrapper. Other fixes. am: d9b9295b8c
am: b930c26c1f

* commit 'b930c26c1f15026aae411bb7575968bee4ed6d09':
  Fix memory leak in generate_key wrapper. Other fixes.