Merge "Keystore signing and verification test"