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

Change-Id: Ia431a5b7ca139209425825616f698f69bfb781c5