Merge "Modifying extraction tool to support P256."