Merge "Fix compat issue from java.security.KeyStore API update"