am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."

* commit '1de4a2ca58df9bd21e054742f52e0af7a2ed5864':
  Fix leak when keylock is recreated.