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

* commit '71050d26a9d0081aae2214f8f17b8a35125976bd':
  Fix non-BC EC private key usage DO NOT MERGE