am 9b1fea82: am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev

* commit '9b1fea82c7ed98b8189a61c37796e37631c923a1':
  Reset keystore when user is added or removed