Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3 am: 6767ce9d24
am: 92982f7167

Change-Id: Iad9b91446823430cb28dd3447819c6b16f7f6b42