am df8cbfa5: am 5678bacd: Merge "Remove keystore entries when app data cleared"

* commit 'df8cbfa5e26df48052ee7aafb548af290f818ef7':
  Remove keystore entries when app data cleared