Merge "Add explicit values to keymaster_key_format_t"