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

Change-Id: Idcbe428c5499a759c759660da6a452385ac29d0f