Merge "Remove unnecessary dependency on bouncycastle"
am: 32fb670a0a

Change-Id: I6289757af66978259b49d4b0b648e049a96b25a7