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

Change-Id: I6531548e8f6e5210526963f28a534d34cf06e67d