Merge "Add TrustyKeyMintDevice"