Merge "Resolve Bug:623 : Generate private key using bouncycastle."