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

* commit '7fff2d19a24f9f9b669676864dc5652ab179d2fc':
  Fix leak when keylock is recreated.