Merge "Remove explicit dependency on bouncycastle"
am: ed21203ea3

Change-Id: Iff190e6a70b85b927597a5b82ff28eaf63070450