Merge "Remove keystore entries when package removed"