* commit 'ba88b692f1a489de308dcf5b5420a23166a94487': Load fewer classes when AndroidKeyStore provider is installed.