am 5db429c3: (-s ours) Merge "Fix non-BC EC private key usage DO NOT MERGE"

* commit '5db429c3eb447595975a7466801318288eef7eda':
  Fix non-BC EC private key usage DO NOT MERGE