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

* commit '4bbe428418d64e240a9a26438d199b156e8fc831':
  Use canonical name for SHA1withECDSA