Merge "Fix non-BC EC private key usage DO NOT MERGE"