Merge "Fixing broken KeyStore CTS tests"