Merge "Fix ApexSignatureVerificationTest"