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

Change-Id: Ic0ad74ce178b395c22291c3fcf3f54e0f09d4a8a