Merge "keystore: remove unused Keystore1 files" into main