Merge "Load fewer classes when AndroidKeyStore provider is installed."