am 68b46319: keystore: Add multi-user support

* commit '68b4631982761f3fdad8886fb7bb81defad79363':
  keystore: Add multi-user support