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

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