Merge "Remove keystore entries when app data cleared" into jb-mr2-dev