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

* commit '0a803fcc2a000985a42072db5b4c9d4917139fcf':
  Reset keystore when user is added or removed