am 24b1c2da: am 6fadf9e9: Merge "Remove obsolete setkey."

* commit '24b1c2da7a704800d77ebd99d5df9f379e4e5e81':
  Remove obsolete setkey.