Merge "Use canonical name for SHA1withECDSA" into nyc-dev am: 4bbe428
am: 775c73f

* commit '775c73f6474522fdb7f4496ad22762d6d1b71702':
  Use canonical name for SHA1withECDSA