Merge "Remove explicit dependency on bouncy castle"