Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev