Merge change 25684 into eclair

* changes:
  keystore: add multi-user support.