am 7a310fbb: keystore: fix upgrades

* commit '7a310fbb5815b3c1ad965d58f4976afca2a721c6':
  keystore: fix upgrades