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

Change-Id: I9319eec41fa2d1bdc9d56bfad7907079838637df