am ba88b692: am e2e5b88e: am 64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."

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