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

* commit '626193926df0b3c7236e5c244f30d797d9192e0d':
  Fix leak when keylock is recreated.