am 92af9812: Merge "keystore: Add multi-user support"

* commit '92af98123a65629a5f13e96567a898aa2cdba6b9':
  keystore: Add multi-user support