Merge "Split key origin into TEE/not and generated/imported."