Merge "Add empty keystore2 crate"