Merge "Enable Java backend for ISecretKeeper" into main