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

* commit '5678bacdffb6871b0d5b428548315cc3bba430bd':
  Remove keystore entries when app data cleared