am 84c64efe: am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by...
am 84c64efe: am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
* commit '84c64efe':
AndroidKeyStore keys should not be handled by Bouncy Castle.