Merge "Enhance ApexSignatureVerificationTest to be more robust" am: aee533a15a
am: 1c940df46e

Change-Id: I31861aeeaac7e300e1751b4ba4c7b862f8fa619f