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

* commit '27c27b708672c125b61e1733be304c9826560151':