Merge "Remove Crypto provider and support classes"