Merge change 25737 into eclair

* changes:
  keystore: switch to multi-user version.