Merge "Use canonical name for SHA1withECDSA"