Merge "Updating a public exponent check" am: 3702b15a2a am: 42b6ecbd53

Change-Id: I8b35aca11d945ab06efad5caa7a85425c80e3224