Merge "Remove bouncycastle dependency from 021-string2."