am 931fac09: keystore: fully reset user keystore on request

* commit '931fac098f2ae35aa1da26ced57962c9a21f95cf':
  keystore: fully reset user keystore on request