Merge "Fixing RSA tests not using the correct exponent" am: ba111275cb am: 97a8659242

Change-Id: I6914b88f2a65188bd5057cca7c85c6bd58e05126