Merge "NativeCrypto: switch throw mappings to switch"