Merge "Remove deprecated BouncyCastle algorithms" am: 17c02a42fc

Change-Id: Ief6a6968cad46ec0d79c2c0eec7f58426fbe2c0e