Merge "More @CorePlatformApis for bouncycastle"